Separate Parser
Adjust declaration order