Cleaned up the directory strucgture