Restructured project to match amfam standards more closely