Re-structured directories, attempt 2