Some project restructuring
All basic functions work