Restructured file tree for future work