Restructure filesystem
Remove deleted files