Cleaned up directories to put runtime in one folder