Refactor file structure
Delete files