Removed stupid subdirectories, updated manifest to follow convention over configuration