Fixed folder structure as per Jorge's suggestion. Resolves #1