Refactored states to its own file
Initial changes for dynamic data