Reorganized the includes folder. Improved readme instructions