Cleaned folder structure
Cleaned folder structure again, following hackerrank name rules