diff --git a/.classpath b/.classpath
index 2846539..20c137d 100644
--- a/.classpath
+++ b/.classpath
@@ -8,10 +8,6 @@
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_241">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 0b6c10d..4e5d31f 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,3 +1,3 @@
-/controller/
 /model/
 /services/
+/controller/
diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class
index 59d8dfc..d228560 100644
Binary files a/build/classes/controller/BusController.class and b/build/classes/controller/BusController.class differ
diff --git a/build/classes/controller/FlightController.class b/build/classes/controller/FlightController.class
index 4023961..ea3fef4 100644
Binary files a/build/classes/controller/FlightController.class and b/build/classes/controller/FlightController.class differ
diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class
index 9738d37..be4ceee 100644
Binary files a/build/classes/controller/HotelController.class and b/build/classes/controller/HotelController.class differ
diff --git a/build/classes/controller/TrainController.class b/build/classes/controller/TrainController.class
index 167c495..72c2986 100644
Binary files a/build/classes/controller/TrainController.class and b/build/classes/controller/TrainController.class differ
diff --git a/src/controller/BusController.java b/src/controller/BusController.java
index f1f8372..905a049 100644
--- a/src/controller/BusController.java
+++ b/src/controller/BusController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Bus;
+import services.FareCalculator;
+
 @WebServlet(urlPatterns= {"/bus"})
 public class BusController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
@@ -28,8 +31,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*
-		
+	
 			int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String bustype=request.getParameter("bustype");
 		String date=request.getParameter("start");
@@ -72,6 +74,6 @@ else if(bustype.equals("nonacsemisleeper")) {
 		request.setAttribute("busfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/busView.jsp");
 		dispatcher.forward(request, response);
-*/	}
+	}
 	
 }
diff --git a/src/controller/FlightController.java b/src/controller/FlightController.java
index 7760e3c..645d836 100644
--- a/src/controller/FlightController.java
+++ b/src/controller/FlightController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Flight;
+import services.FareCalculator;
+
 
 
 @WebServlet("/flight")
@@ -29,7 +32,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String classtype=request.getParameter("class");
 		String from=request.getParameter("from");
 		String to=request.getParameter("to");
@@ -59,6 +62,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		request.setAttribute("flightfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/flightView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }
diff --git a/src/controller/HotelController.java b/src/controller/HotelController.java
index 0c39e3b..14e58ec 100644
--- a/src/controller/HotelController.java
+++ b/src/controller/HotelController.java
@@ -12,8 +12,8 @@
 
 
 
-/*import model.Hotel;
-import services.FareCalculator;*/
+import model.Hotel;
+import services.FareCalculator;
 
 
 
@@ -33,7 +33,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String roomtype=request.getParameter("roomtype");
 		String occupancy=request.getParameter("occupancy");
 		String from=request.getParameter("from");
@@ -67,6 +67,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/hotelOutputView.jsp");
 		dispatcher.forward(request, response);
 	
-*/	}
+	}
 	
 }
diff --git a/src/controller/TrainController.java b/src/controller/TrainController.java
index dcc07df..3764d7e 100644
--- a/src/controller/TrainController.java
+++ b/src/controller/TrainController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Train;
+import services.FareCalculator;
+
 
 /**
  * Servlet implementation class TrainController
@@ -31,7 +34,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 	
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String berth=request.getParameter("berth");
 		String date=request.getParameter("to");
 		System.out.println(numberOfPersons);
@@ -68,6 +71,6 @@ else if(berth.equals("nonac")) {
 		request.setAttribute("trainfare", trainfare);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/trainView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }
diff --git a/src/model/Bus.java b/src/model/Bus.java
index 430ca5d..85fbd77 100644
--- a/src/model/Bus.java
+++ b/src/model/Bus.java
@@ -1,3 +1,43 @@
 package model;
 
+import java.time.LocalDate;
+
 // Type your code
+public class Bus{
+	private int noOfPersons;
+	private String busType;
+	private int rates;
+	private LocalDate date;
+	public Bus(int noOfPersons, int rates, String busType, LocalDate date) {
+		super();
+		this.noOfPersons = noOfPersons;
+		this.busType = busType;
+		this.rates = rates;
+		this.date = date;
+	}
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getBusType() {
+		return busType;
+	}
+	public void setBusType(String busType) {
+		this.busType = busType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getDate() {
+		return date;
+	}
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+	
+}
diff --git a/src/model/Flight.java b/src/model/Flight.java
index 9ac54b5..5a58191 100644
--- a/src/model/Flight.java
+++ b/src/model/Flight.java
@@ -1,3 +1,59 @@
 package model;
 
-//Type your code 
\ No newline at end of file
+import java.time.LocalDate;
+//Type your code
+public class Flight{
+	private String classType;
+	private int rates;
+	private LocalDate from;
+	private LocalDate to;
+	private int noOfPersons;
+	private String triptype;
+	public Flight(int noOfPersons,int rates,  String classType, LocalDate from, LocalDate to,  String triptype) {
+		super();
+		this.classType = classType;
+		this.rates = rates;
+		this.from = from;
+		this.to = to;
+		this.noOfPersons = noOfPersons;
+		this.triptype = triptype;
+	}
+	public String getClassType() {
+		return classType;
+	}
+	public void setClassType(String classType) {
+		this.classType = classType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getFrom() {
+		return from;
+	}
+	public void setFrom(LocalDate from) {
+		this.from = from;
+	}
+	public LocalDate getTo() {
+		return to;
+	}
+	public void setTo(LocalDate to) {
+		this.to = to;
+	}
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getTriptype() {
+		return triptype;
+	}
+	public void setTriptype(String triptype) {
+		this.triptype = triptype;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/model/Hotel.java b/src/model/Hotel.java
index b21180d..b62892b 100644
--- a/src/model/Hotel.java
+++ b/src/model/Hotel.java
@@ -1,2 +1,57 @@
 package model;
-// Type your code
\ No newline at end of file
+// Type your code
+import java.time.LocalDate;
+
+public class Hotel{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	public Hotel(int noOfPersons, String roomType, int rates, String occupancy, LocalDate fromdate, LocalDate todate) {
+		this.noOfPersons = noOfPersons;
+		this.roomType = roomType;
+		this.rates = rates;
+		this.occupancy = occupancy;
+		this.fromdate = fromdate;
+		this.todate = todate;
+	}
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getRoomType() {
+		return roomType;
+	}
+	public void setRoomType(String roomType) {
+		this.roomType = roomType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public String getOccupancy() {
+		return occupancy;
+	}
+	public void setOccupancy(String occupancy) {
+		this.occupancy = occupancy;
+	}
+	public LocalDate getFromdate() {
+		return fromdate;
+	}
+	public void setFromdate(LocalDate fromdate) {
+		this.fromdate = fromdate;
+	}
+	public LocalDate getTodate() {
+		return todate;
+	}
+	public void setTodate(LocalDate todate) {
+		this.todate = todate;
+	}
+     	
+}
\ No newline at end of file
diff --git a/src/model/Train.java b/src/model/Train.java
index b21180d..033df9f 100644
--- a/src/model/Train.java
+++ b/src/model/Train.java
@@ -1,2 +1,43 @@
 package model;
-// Type your code
\ No newline at end of file
+
+import java.time.LocalDate;
+
+// Type your code
+public class Train{
+	private int noOfPersons;
+	private String berth;
+	private int rates;
+	private LocalDate date;
+	public Train(int noOfPersons, int rates, String berth, LocalDate date) {
+		super();
+		this.noOfPersons = noOfPersons;
+		this.berth = berth;
+		this.rates = rates;
+		this.date = date;
+	}
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getBerth() {
+		return berth;
+	}
+	public void setBerth(String berth) {
+		this.berth = berth;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getDate() {
+		return date;
+	}
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+	
+}
\ No newline at end of file
diff --git a/src/services/Booking.java b/src/services/Booking.java
index fe2c822..8cf4b2c 100644
--- a/src/services/Booking.java
+++ b/src/services/Booking.java
@@ -2,3 +2,8 @@
 
 // Type your code
 
+public class Booking{
+	public double booking(int noOfPersons,int rates) {
+		return (double) noOfPersons*rates;
+	}
+}
diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java
index 6d38ab5..8b39d3e 100644
--- a/src/services/FareCalculator.java
+++ b/src/services/FareCalculator.java
@@ -1,3 +1,35 @@
 package services;
 
-// Type your code
\ No newline at end of file
+import model.Bus;
+import model.Flight;
+import model.Hotel;
+import model.Train;
+
+// Type your code
+public class FareCalculator extends Booking{
+	public double book(Hotel hotel) {
+		 if(hotel.getFromdate().isBefore(hotel.getTodate())) {
+			 int rooms = (hotel.getNoOfPersons()/2)+hotel.getNoOfPersons()%2;
+			 return hotel.getRates()*rooms;
+		 }
+		 return 0;
+	}
+	public double book(Flight flight) {
+		double fare = 0;
+		if(flight.getFrom().isBefore(flight.getTo())) {
+		if(flight.getTriptype().equals("one-way-trip")) {
+			fare =  flight.getNoOfPersons() *flight.getRates();
+		}else {
+			fare =  flight.getNoOfPersons() *flight.getRates()*2;
+		}
+		}
+		return fare;
+	}
+	public double book(Train train) {
+		double fare = train.getNoOfPersons() *train.getRates();
+		return fare;
+	}
+	public double book(Bus bus) {
+		return bus.getRates()*bus.getNoOfPersons();
+	}
+}
\ No newline at end of file