Restructure source directory (ref #36)