Re-organized directory structures to both source & output/classes
directory