Cleaning up files and moving to .tex include