Restructure files
Add rack