Moved around stuff, updated
Added .idea