Fixed issues with the folder structure