Cleaned up weight generation, further package organization!