diff --git a/src/pyrmv/__init__.py b/src/pyrmv/__init__.py
index 087d2cb..58ad764 100644
--- a/src/pyrmv/__init__.py
+++ b/src/pyrmv/__init__.py
@@ -21,9 +21,9 @@ trip = client.trip_find(origin_id=origin.id, dest_id=destination.id)
 """
 
 __name__ = "pyrmv"
-__version__ = "0.3.6"
+__version__ = "1.0.0"
 __license__ = "MIT License"
 __author__ = "Profitroll"
 
 from . import classes, const, enums, errors, raw, utility
-from .classes.Client import Client
+from .classes.client import Client
diff --git a/src/pyrmv/classes/__init__.py b/src/pyrmv/classes/__init__.py
new file mode 100644
index 0000000..c3babc0
--- /dev/null
+++ b/src/pyrmv/classes/__init__.py
@@ -0,0 +1,9 @@
+from .board import BoardArrival, BoardDeparture, LineArrival, LineDeparture
+from .client import Client
+from .gis import Gis
+from .journey import Journey
+from .leg import Leg
+from .message import Channel, Message, Url
+from .stop import Stop, StopTrip
+from .ticket import Ticket
+from .trip import Trip
diff --git a/src/pyrmv/classes_new/Board.py b/src/pyrmv/classes/board.py
similarity index 98%
rename from src/pyrmv/classes_new/Board.py
rename to src/pyrmv/classes/board.py
index a52a1d5..b5362f0 100644
--- a/src/pyrmv/classes_new/Board.py
+++ b/src/pyrmv/classes/board.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Any, Mapping
 
-from pyrmv.classes.Message import Message
+from pyrmv.classes.message import Message
 
 
 class LineArrival:
diff --git a/src/pyrmv/classes_new/Client.py b/src/pyrmv/classes/client.py
similarity index 100%
rename from src/pyrmv/classes_new/Client.py
rename to src/pyrmv/classes/client.py
diff --git a/src/pyrmv/classes_new/Gis.py b/src/pyrmv/classes/gis.py
similarity index 100%
rename from src/pyrmv/classes_new/Gis.py
rename to src/pyrmv/classes/gis.py
diff --git a/src/pyrmv/classes_new/Journey.py b/src/pyrmv/classes/journey.py
similarity index 90%
rename from src/pyrmv/classes_new/Journey.py
rename to src/pyrmv/classes/journey.py
index a2deca4..1cd2f37 100644
--- a/src/pyrmv/classes_new/Journey.py
+++ b/src/pyrmv/classes/journey.py
@@ -1,7 +1,7 @@
 from typing import Any, Mapping
 
-from pyrmv.classes.Message import Message
-from pyrmv.classes.Stop import Stop
+from pyrmv.classes.message import Message
+from pyrmv.classes.stop import Stop
 
 
 class Journey:
diff --git a/src/pyrmv/classes_new/Leg.py b/src/pyrmv/classes/leg.py
similarity index 87%
rename from src/pyrmv/classes_new/Leg.py
rename to src/pyrmv/classes/leg.py
index be3594d..eb27d5f 100644
--- a/src/pyrmv/classes_new/Leg.py
+++ b/src/pyrmv/classes/leg.py
@@ -2,9 +2,9 @@ from typing import Any, Mapping
 
 from isodate import parse_duration
 
-from pyrmv.classes.Gis import Gis
-from pyrmv.classes.Message import Message
-from pyrmv.classes.Stop import StopTrip
+from pyrmv.classes.gis import Gis
+from pyrmv.classes.message import Message
+from pyrmv.classes.stop import StopTrip
 
 
 class Leg:
diff --git a/src/pyrmv/classes_new/Message.py b/src/pyrmv/classes/message.py
similarity index 98%
rename from src/pyrmv/classes_new/Message.py
rename to src/pyrmv/classes/message.py
index 4b151bc..f5ae8e2 100644
--- a/src/pyrmv/classes_new/Message.py
+++ b/src/pyrmv/classes/message.py
@@ -3,7 +3,7 @@ from typing import Any, Mapping
 
 from isodate import parse_duration
 
-from pyrmv.classes.Stop import Stop
+from pyrmv.classes.stop import Stop
 
 
 class Url:
diff --git a/src/pyrmv/classes_new/Stop.py b/src/pyrmv/classes/stop.py
similarity index 100%
rename from src/pyrmv/classes_new/Stop.py
rename to src/pyrmv/classes/stop.py
diff --git a/src/pyrmv/classes_new/Ticket.py b/src/pyrmv/classes/ticket.py
similarity index 100%
rename from src/pyrmv/classes_new/Ticket.py
rename to src/pyrmv/classes/ticket.py
diff --git a/src/pyrmv/classes_new/Trip.py b/src/pyrmv/classes/trip.py
similarity index 93%
rename from src/pyrmv/classes_new/Trip.py
rename to src/pyrmv/classes/trip.py
index 809d85e..3693f16 100644
--- a/src/pyrmv/classes_new/Trip.py
+++ b/src/pyrmv/classes/trip.py
@@ -1,7 +1,7 @@
 from isodate import parse_duration
 
-from pyrmv.classes.Leg import Leg
-from pyrmv.classes.Stop import StopTrip
+from pyrmv.classes.leg import Leg
+from pyrmv.classes.stop import StopTrip
 
 
 class Trip:
diff --git a/src/pyrmv/classes_new/__init__.py b/src/pyrmv/classes_new/__init__.py
deleted file mode 100644
index ab6bb04..0000000
--- a/src/pyrmv/classes_new/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from .Board import BoardArrival, BoardDeparture, LineArrival, LineDeparture
-from .Client import Client
-from .Gis import Gis
-from .Journey import Journey
-from .Leg import Leg
-from .Message import Channel, Message, Url
-from .Stop import Stop, StopTrip
-from .Ticket import Ticket
-from .Trip import Trip