Removed some files and structured project halfway