Rescructured for Mavens Standard Directory Layout, closes #6