Restructure code subdir