Change Project Structure to work with GitHub