Restructure skeleton
Add file functions