Added a proper folder structure