Clean up on dirctory structure and Problem 15