Restructed file structure
Added some skeletons for new classes