Re-worked project into better structure.