Refactored screwed up Java directory structure and solved p26