Cleaned code up a bit and fixed project structure