Generate BOMs
Cleaned up some folder hierarchy