Reworked Project Structure

Changed project structure for better git / Travis CI form