Cleaned up the file-structure