Some organization and more work on build