Restructured src folder in FS project for better seperation of concerns.