Re-organized folder structure a bit, to clean up root folder