Removed annoing file structure