.some restructuring, gitignoring more crap