Moved to their own package
Added normal padlock
padlock for when toolbox is open
Updated imports
updated imports
Moved to their own packages

Done this for better organization