Cleaned up structure, added life to bootstrap used classes