Corrected folder structure, added manifest