Organizing files and tweaking install