Moved to using state attribute
Cleaned up dir structure