reorganization of frontend files
merge conflict