Restructure directory
Remove swap file