Restructure & organize files, and remove button